From 0e07d8b189e731b9d1c9e3b3eb7781b04a00a0f9 Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Sat, 4 Jul 2009 20:13:43 +0200 Subject: [PATCH] Hack that works around firefox plugin crash It turns out that mozilla, as per the gtk2xt code selects for input on the socket with a mask of 0x0fffff (for god knows why) which includes ButtonPressMask, causing a BadAccess if someone else also selects for this. As per the client-side windows merge we always normally selects for button press so we can emulate it on client side children that selects for button press. However, we don't need this for GtkSocket, so we unselect it here, fixing the crashes in firefox. --- gtk/gtksocket-x11.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gtk/gtksocket-x11.c b/gtk/gtksocket-x11.c index bbeb8af792..f6f3a3d489 100644 --- a/gtk/gtksocket-x11.c +++ b/gtk/gtksocket-x11.c @@ -70,9 +70,17 @@ _gtk_socket_windowing_realize_window (GtkSocket *socket) GDK_WINDOW_XWINDOW (window), &xattrs); + /* Sooooo, it turns out that mozilla, as per the gtk2xt code selects + for input on the socket with a mask of 0x0fffff (for god knows why) + which includes ButtonPressMask causing a BadAccess if someone else + also selects for this. As per the client-side windows merge we always + normally selects for button press so we can emulate it on client + side children that selects for button press. However, we don't need + this for GtkSocket, so we unselect it here, fixing the crashes in + firefox. */ XSelectInput (GDK_WINDOW_XDISPLAY (window), GDK_WINDOW_XWINDOW (window), - xattrs.your_event_mask | + (xattrs.your_event_mask & ~ButtonPressMask) | SubstructureNotifyMask | SubstructureRedirectMask); } -- 2.30.2